diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-26 15:04:42 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-26 15:04:42 +0100 |
| commit | 27c00e2c5fb8a01eb33658a0d40d11f3723ced55 (patch) | |
| tree | c2b69178612360d23a1b2f2f61a85b9874153d1d | |
| parent | 6bbd3c1243b8478d1705769288de0f4fe66108b3 (diff) | |
| parent | 3835ed15d6fb0fd63e22a728f790fe564d9b4a32 (diff) | |
| download | Chimère - projet de référence-27c00e2c5fb8a01eb33658a0d40d11f3723ced55.tar.bz2 Chimère - projet de référence-27c00e2c5fb8a01eb33658a0d40d11f3723ced55.zip | |
Merge branch 'master' of gitorious.org:chimere-example-project/chimere-example-project
Conflicts:
.gitignore
settings.py
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | project_static/.project_static | 0 | ||||
| -rw-r--r-- | settings.py | 1 |
3 files changed, 3 insertions, 2 deletions
@@ -4,5 +4,7 @@ *.mo *.ignore static -media local_settings.py +media/* +static/* +*.pyc diff --git a/project_static/.project_static b/project_static/.project_static new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project_static/.project_static diff --git a/settings.py b/settings.py index a07de9e..0d7009c 100644 --- a/settings.py +++ b/settings.py @@ -140,7 +140,6 @@ CHIMERE_CSV_ENCODING = 'ISO-8859-1' CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute'] CHIMERE_DEFAULT_ACTION_LABEL = [u"Cartes", u"Ajouter un element"] - # generic contact email CONTACT_EMAIL = '' |